small fixes based on PR feedback