Eldar: Some fixes