More updates to 1.7 Django