Various minor messing around.