jbarczak Misc. fixes and optimizations