API version in routes + Some fixes