Changes necessary for WANdisco repo