Fixes for touchscreen and keys