First commit corrections