Minor changes due to renamed functions