Minor prototype 4 fixes