couple more fixes (and breaks)