Fixed some length constraints stuff