Changes to work with rust v-0.6