Loose pointers fixes