Fix references to fixnum types - part 2