Fixes two fixed-point overflow issues