Moooore compiler error fixes