Fixed build setup