A couple extra improvements