Fix some Quirks