SH compatability fixes