Fix welcome handlers