Attempted fix for syntax warnings