Some further fixes