Fix build, fix reference links