Fixes for user set-up