- Various bug fixes