Fixed couple issues with compat