Improved logging and comments
Fixed issue with the Servlet3 flag initialization