Minor fixes for instrumentation

Update your tween branch to include my fixes.