Fixing reviews

Merge at will, missing just augfacter and/or aug.load review fix, anyway we'll see in your PR which review comments will be outdated.
Fixed in e8b43b9aed284094e94e6aed6077efb4b4a63394.