Various dependency issues in the development repository