Fixed some business validation