Checksource fixes