Fixes to make working