Some fixes / optimizations