Changes I made a long time ago and forgot to commit