Compatability fixes.