Maintainer scripts improvements