Implemented more correct make rules