further metadata fixes