- Fix x86_64 arch
- Fix error with 'as' variable