Testing more optimization fixes