More compiler error fixes