some fixes while getting the code working on ARM again