Things fixed to match documentation