Small fixes to make app work correctly