Fixed oldie support and a navigation bug