Fixes based on code review feedback