Fixes from PR discussion