component fixes