space saving fixes