Fixed a few quirks