General metadata fixes