Fixes for Welcome Module