Power failure fixes