knocked out some more compile errors