various const fixes