Adding more fixes