Minor fixes based on review and extended usage