Added more fixes