Fix some symbol and Makefile issues