Various bug fixes and stability improvements