Small fixes so it can be run