fixes to prev commit