Fix minor code style issues
Add missing 3rd-party source file