more invoke fixes