Fixes regression in previous commit. Some errors/warnings were lost