Final bug fixes before release

@stowellm 
What are these for?  Are they still required?