Fixes in structure loading
1.1.7-5