Resolve issues due to maintenance updates