More fixes for review