Few semantic improvements...