Fixed some observation refactor bugs with Int/Integer