Fix a few of the issues mentioned on the ticket

This should hopefully fix a few of the smaller issues I mentioned on http://tickets.musicbrainz.org/browse/MBS-4376