Fix build issue and decimal field issue