All quirks fixed