Added validation to some Fill fields