- Various bug fixes
