Fixed bugs resulting from merge & q/a switcharound