Fix some @fivetanley suggestions