Review fixes

#203