More annoyance fixes