Fixes from peer review