Avoid a few errors and improve image meta