2.1.5

Compatability fixes