Adds minor fixes