Fixes for unneeded dependency resolution and makefile bugs