Cleaning up misc nits to get things working again.