incorporate fixes