Minor fixes to avoid warning