More error fixes. It seems like the master merge didn't get committed properly.