more fixes to get it back to work