Fixes for first-time users