Make time 2 and 3 year checks against 1.8 only and add missing warns