[Add some fixes]