Metadata fixes, short version