fixes based on staged
fixes based on staged