fix some funky shit with fast typing

Change-Id: I809261712f8b0058341acea7901f634ee1f5399f