Fixed a couple of minor annoyances