Changes I forgot to check in a week ago