Fix encoding issues
Add xccheckout