Review22

Fixes for review22