ticket:5 Added small fixes