A few fixes to account for 0