Fixes based on the code review