fixed several problems when using 1.3.6 target core version