Few more fixes - adrien