Small fixes following PR comments