Fixes for 0.1.9 with ARM build fixed