r4414: Various bits&pieces: