Further code review fixes