[Fix] last urgent fixes