more fixes

more fixes