Minor changes

Bug fixes