Final corrections and checks