Several bin -> build corrections