Fix shell module and Makefile