Small Bug fixes!