Little more cleanup of notices.