Minor issues with handheld devices fixed