Fixed various annoyances