fixes for big expressions and stress testing