Minor fixes in Application & WebApplication