Corrections for better compile
First commit for this file