Minor bug fixes in menu directory