minor component fixes