MADE:
--> Fixing cross-compiling issues in the code