Minor fixes for chainsaw

Fixes suggested by ShadowNinja