(still) fixing build errors