Some klay changes.