Edge and Learning Mode fixes.