Little changes for my use.