+con #16141 Remaining small fixes to better support Java compatibility