- Minor bug fixes
