uhm, more non-const stuff for tools/things that are supposed to be const