Fix missing parameters type; fix compiler warning for switch case fallthrough