Some old changes I forgot to commit ;)