Fix typo and src locations