general fixup

#2