Add deleteMetadataMessage method + small fixes.