Some minor bug fixes to get data flowing