Stragglers

Some straggling modifications that didin't make it in the last commit,
for some reason.