[ubuntu] Ubuntu 14.04 won't shutdown from menu (UEFI Issue too?)

I think these two issues are related.

1. While installing a recent update (?shim-signed?) I was informed that UEFI was going to be disabled on my machine. I was asked to supply and confirm a password. Then a screen came up saying hit any key to proceed, but hitting the key just triggered Ubuntu to start normally. (No troubles apparent at the time).

2. After my session I tried to shutdown using the menu from the panel. No dice. Because I have seen some issues of slow shutdown I just left the machine... for an hour. Still no shutdown. "sudo shutdown -P now" works fine.

Other info. I have a new grub menu that says:

Ubuntu
-- Advanced options for Ubuntu
-- UEFI options (something like that)
-- System setup

If I choose the UEFI setup options I get an error message about a missing file with an extremely long file name including MokManager EFI... (Machine retus to Grub before I can write file name down)