More Bug-fixes