Tentative fixes for money plugin