Fixed build and tp