build, tiny fixes