Fix FTB-related issues