Small component fixes