switch to final revs of jpaw and fixedpoint