rifter's gathering fixes