Fix some namespace errors.