Change types to avoid warnings