Stability bug fixes