Bug fixes, play nice with other plugins