Fixes for django 1.5