more fixes again...