Design notes fixes