Fix goto-point inexistent function and cl warnings.