Fixed some metadata related issues