Fix: issues found by reviewer.