Some urgent fixes