Bug fixes
More bug fixes