Small Bug fixes