Various fixes related to TFC Florae