Small fixes (0 and '' should not be considered as undefined)