Even More Bug fixes