some fixes for vscm and arm