Small fixes (current_user == None)