Minor fixes for compile fail