Fixes based on review by Ravi