More issue 13 updates