additional fixes - adrien