Minor bug fixes and upgrading uxGenie