Multiple Bug fix