Core improvements.