Fix interface name after merge
Fix cast warnings