assembly various fix
2 files changed