More stability fixes and improvements.