more fixes to different structures