Fixes some annoyances for regular users.