Work in progress: stability fixes