More fixes (thanks David for "Hewlett")