Some updates and fixed apitrace build