more fixes to avoid warnings