Fixes to get running again.