Small fixes from PR #603