fixes for user checks