Fixing issues to make assembly compilation to work
Updating TODO