Couple of bug fixes for the admin bar menu