fixed some warnings (when on earth did I do a bad find/replace on these functions?)