Minor changes to please Lord Starkad