Compatibility fixes for our existing app