Rebar + Makefile changes