fixes for other devices design