Some things I forgot to include in the merge