Fixes in add third-party repo and setup apps