More fixes for Remo