Added Rodri fixes