Removed warnings of constness