More rupee->gem bugfixes