Fix some helper code bugs