Some smaller changes