Lots of fixes to make app work out of the box