Fixes for Teleport build