Changes for fixing django errors in views, first steps sigh ...