Applied review fixes