Bug and Stability fixes