Feature/minor fixes