Minor updates to make compatabale.