3.0 misc

:+1: to @lorenzo 's comments.