backcompact fixes