Rectificatin here and there