Various modifications.