Declarations as interface fixes

kpmartin quan1992