Few changes to make it up to date with new versions