Bugfixes in Make system