NXIDE-282 Various bug fixes and performance enhancements