Implement fixes from review