Backwords compat fixes