Minor updates

Bug fixes