Changes for the sake of a meeting

Nothing major. These changes will be taken away later.