small annoyance fixes