Initial commit corrections