Some fixex