Just minor fixes. Hopefully this solution is better than the "const int" one in the previous pull request.