Review: Fixes #3