Final bug fixes before release

@stowellm