Some small additions for testing purposes.