Plan fixes