Use correct types for override variables