Compilation verified - minor changes