Initial spoor fixes