Test version 18 update

Assorted bug fixes