Full -> Floyd bug fixes