Bug fixes again

Bug fixes again