Resolve compile errors temporarily