warning fixes (and forgot to save one file.. oops)