more fixes

yeaye