Misc stability and performance improvements