Fixing more checksource issues