Cleared up some notices from cp/menu change. #1383 #1384