Fixes for position tracking