Fix some quirks