Fixed warnngs