Fixes for 16.06