Edits to catch up with changes in Internal.R that hides away key functions