updated target platform and fixed NPE