Minor improvements to support SirraFitness