Makefile FIX, shell.yml FIX