Code review after deployment of Ratchet triggered some bug fixing