Updates to fix keyboard