Bug fixes
More Changes