Two more changes that are needed for this to build successfully. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>