Various improvements (log4j, parameterised apps)