Money management related fixes