Minor bug fixes in source and target checker