Money warning fixes #287

Closes #287