Bug fixes, Refactor away from needing Plugin reference (for testing)
Patch SQLite