Fix Some & Upgrade to 4.1.26