a few more current_user changes