Patches needed for blue-server