Minor fixes to avoid warnings