Two patch sets from Scott McKellar