Fixing checksource issues as well as style