Small fixes from PR