More optimizations as discussed #127