Changed set values methods to reflect the 0 problem fix