review related fixes