Annoying fixes.