Fixes to make repo compile successfully