Various fixes, start using req field