COMP: fixes for change to single precision

Change-Id: Ib6a701c24babfbe9efbf3439d47760ce7eba3e10