Add ARM solution + fix Unix build