more fixes for other devices