Itty-bitty changes for just porting over to another project.