Fixes to meet specs