Removed several const accessors