Various additions to package management snippets