Correction of some issues