Minor update to clean-up warnings