Feature/similar fixes