Reenabled more optimizations, #90, #91