more fixes, all good