Make Script Fixes