Misc fixes all around.