Checked in 2 fixes in the code