Small change
More small fixes