Compatibility fixes for GingerSony