A couple of changes I forgot in the initial commit