Correct build for other targets