u8800: Add these in again to make sure they are getting picked up