Added more fixes...