Misc review fixes