Minor adjustments, type sigs...