Fixes inconsistencies between docs and code