fixes on Curver