more fixes that were on the wrong branch