* const'ified the two files to be able to remove warnings somewhere else