OMS 1.3 Commit : Fix FC, Various Bugs