Finall fixes