Will fix both those issues tomorrow.