Fixed component issues