Add FTL and cleanup errors
Adding missed stuff