Fixes and requeriments