Small fixes on 2.5+ plugin