Minor fixing and log4j configuration