Some minor additions to the helper routines