Changes

Bug fixes