Minor updates to new analytics framework

Just tidying up.