Some fixes to hlxce-sm-api by DoPe