fixes for working on other devices