Fix errors after refactor
Fix errors after refactor

gmarkall/numba,sklam/numba,gmarkall/numba,seibert/numba,stonebig/numba,stefanseefeld/numba,numba/numba,numba/numba,seibert/numba,stuartarchibald/numba,IntelLabs/numba,stonebig/numba,gmarkall/numba,sklam/numba,cpcloud/numba,numba/numba,IntelLabs/numba,stuartarchibald/numba,IntelLabs/numba,jriehl/numba,gmarkall/numba,seibert/numba,cpcloud/numba,stonebig/numba,gmarkall/numba,cpcloud/numba,IntelLabs/numba,stuartarchibald/numba,stuartarchibald/numba,stonebig/numba,seibert/numba,cpcloud/numba,IntelLabs/numba,seibert/numba,stuartarchibald/numba,jriehl/numba,sklam/numba,sklam/numba,jriehl/numba,sklam/numba,stefanseefeld/numba,stefanseefeld/numba,cpcloud/numba,stonebig/numba,stefanseefeld/numba,stefanseefeld/numba,jriehl/numba,numba/numba,jriehl/numba,numba/numba