Various SpringPlugin fixes

Hi Andy, feel free to rollback my Polish commit, it was just a proposal.