Fix builds

Fix builds and improve perf of round by a huge factor.