-- more fixes