Make sure tracking is working for companies, clean up some specs