Fix Initial Prefix and Check issues