More bug fixes
More bug fixes