[[ Bug 11573 ]] Fix few issues with the menu builder