Fixes from code review comments