Minor changes to servlets