mostly just annoying fixes