Tweaks to check for valid epoch and values