More tweaks. Solves an issue where Garcon was loading itself as a plugin