Couple more missing functions (why?)