Fix Dashboard creation