build error fix & etc