Fix suggestions from peer-review