Integrated updates from roguekit's barf