fixup some const() issues.