More minor changes on the application layer.