Small compiler error fixes