#461: Add changes from review comments