Small fixes for plugins before the OL version upgrade