Misc. changes on App framework.