build target fixups