3ad1d02 More fixes after review

Authored and Committed by zbyszek 8 years ago
    More fixes after review