Fixed some small bugs / annoyances