Some left-overs for future fixes