Minor fixes for SnapBill