fixes from mikeb