Several fixes for 201404 - 201405 compatibility bugs
Versioning