Small fixes based on review