and even more fixes..