Completed necessary fixes to make app work.