Correct mistakes in the main package