Fixes from review, style