Multiple Bug fixes