Some fixex.