Fixing some checksource problems