Various bug fixes
Merge branch 'ngadmin-0.0.8'