Feature/disable fixes