Fixed a few minor annoyances