Various small changes and updates.