I forgot to make this PR earlier

Some other changes