Add some unuseful optimizations