Logging fix
metadata fix