fixup! Respond to review comments