Final set of fixes to make it work for Howard and other data #1