Updates to work with trunk version