Changes for rebar-based build