Fix some FC issues