Some fixes on regression :)