few more fixes-shouldn't break