Missing package and minor cleanup