Fixes for django 1.6+