add back @antonbloom fixes (nuked by wiki migration)