GH54 - Fixes after code review