Some fixes to structure initializer lists