Stable45 fix minor files annoyances

backport of #938