Fixed small issues leftover from the botched commit