Minor fixes for internal release