Bump target to 20; a few more lint fixes