Getting rid of some annoyances