Fix build error and some stylecop warnings