Repository and Calculator Fix