multiple deployment and stability fixes