Fixed problems caused by Metadata changes