Feature/small fixes