Compatibility fixes for LuneOS