Remove warnings, constify