Some bug/annoyance fixes