[WIP] Small maintenance tasks

This PR collects a number of small maintenance tasks.