some small immediate fixes