Updates to the plugin to finally fix it to work with containers with
padding.