Fix and add local build