Enh helpers

#443