Few minor fixes. Back to 100% compile, but error at end (in Linux). 200+ errors in windows.