Minor fixex.