Minor configuration & app code changes