Little Bug fixes