Fix componets