Fixes for local and global maintenance protocols