Fix a couple of left overs from code experiments