more fixes

damn new specs changing all the time…