More Buckmaster fixes