AMD: minor fixes for Oasis and Mobile