#87 #88 Fix build