Fixed navigateToStep: method and a couple of warnings