Fixes in structure loading