Fixed more length constraints stuff