Fixes for make system