Fixes based on review