Minor fixes in structure