More compat changes

Signed-off-by: Guenter Roeck <linux@roeck-us.net>