Do small fixes
Favor nil?