decimal related fixes