Minor fixes - to update code_structure