Initial errors cleanup