Minor fixes for compile errors