Some fixes in DefaultController