Fix  build errors from previous commit