Some minor fixes in the structure