smaller const fixes