FD Fixes