Increase Linux compatibility
Add changes required by Saya