Fixed some sgserial control types
Merge branch 'testing'