annoying fixes