fixes

more fixes