Improvements: Minor bug fixes and stability improvements
