Fixes according to document