More Bug fixs...