Fixes to intent and indirect pushes to #163