Fixing some quirks...