Fix import in account views.
Fix list comprehension in billing views