[smartonic] Fixes to support previous smart fixes!