Resolving Mac and Android build issues.