Some fixes on ver 3.5 for Unity/Mono