More unpackaged files fixes