Changes following recent bug fixes