I added more fixes