Remo fixes