Dev Some small fixes