Fixed some more compile errors