Cleaned up a couple of open issues for a completed story