fixing a couple compile errors after develop merge