two urgent fixes