Updated with latest F3 Fixes