Some fixes + Route handler