Fixed controllers and masterServlet