Fixes for user set-up
v0.1.1