shorty_tracking: some minor fixes.