Fixes for 6.3

struct defined if .cpp, list works better and faster.