Fixes to keep inline with current standard and reality.