some fixes to 12