More Bug fixes