Fix errors so that exact branch will still compile when python support is turned off