Fix other fnl uses