fixes for current-user things