Restored some inadvertently removed fn's