Fixed missing functions from master