Fixes for make -j option