Fixes for django 1.7.x