Main and Rolo Initialization fixes