Added some metadata fixes.