Made fixes for curves