Continued positioning fixes for tps and clock.