Minor change

Bug fixes