Various fixes to enter compatabiltiy mode