Code fixes per technical editors