Clean up some errors caught by FDT