Added small fixes