Some stability fixes, not important