Fix target/file mixup; preliminary makefile identification fix