Rebar/makefile fixes