Last call fixes for 0.16 release