Fix basic components