Readded some const-nesses