fixing a -fpermissive compile problem
fixing a couple things