fixes based on PR