Fix unit errors

@jamie-cyber1 please review.
@emilyhahn please review.