Removed some annoyances.