Some less optimizations