Fix issues with make tasks