fixes for brandons merge