various further fixes