Buckmaster fixes