Fixing more compile errors