Fixed a few install/App setup bugs