Apply fixes for django >=1.5