TFC Florae Fixes

Various fixes for TFC Florae