Fixes from Mike comments