Fixes made to structure