Add a couple fixmes to mark deprecated calls