Api quirks fix