Bug/small fixes