Date restrictions for post-1989 countries and some minor code corrections