Repair after misterious code disappearances
Added leftovers