Some more missing functions changed