[FOLD] fixes based on review