more fixes: