Fix for JavaDoc warnings