Added some Unwrap statements for Keyboard