Fixing more errors after a terrible commit