Fixed basic components errors