Main app fixes.