Resolve review fixes