Working with some fixes