small code changes to avoid warnings/errors in FDT