Various SpringPlugin fixes