More fixxes
Last changes