Fixes
Consolidate all plugins into bundle at build