Cleaning

Cherry-pick commits fixing minor issues noticed by @mtbc while reviewing #623