Simplify some code
Update spec for plugin combo
Rebuild packages