Merge "Small Bug fixes"