No more 'const's and WARNINGS!