Some small fixes;