A few updates to Server.java and Configuration.java