Updated application to fix minor issues preventing TomcatServer starting